-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Methods to update the data for the moving average speed chart #195
Open
darianou
wants to merge
3
commits into
rilling:main
Choose a base branch
from
attack-on-c-plus-plus:darianou-patch-1
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changed moving avg logic and included dependencies code logic
* Renamed SeasonalStatistics.java and its seasonal variables into OverallStatistics.java and its corresponding named variables. * Removed the fab from the LeaderboardActivity * Added the Podium icon that Jeremy found and integrated on his branch. * minor fixes and formatting * Fix[COMP354-87]: Update references * Task[COMP354-87]: Showcase data pushed in logs * Feat[COMP354-87]: Default constructors until actual impls ready * Moved the java files to one directory * Wrote a simple avg speed calculation Haven't tested it yet * Fix[COMP354-87]: Update JSON payload * Did most of the refactor, but the code crashes now... * Removed the LeaderboardListViewModel * Removed a line * Added a Fragment that works. Looks like I need to build off this to get the Leaderboard working... * Remove main method from DailyPlottingModule * Removed my old leaderboard files (again) * Changed the xml file names * Renamed a file * Renamed another file * Updated the Ranking class * Got the Rankings to show(!) * Removed the placeholder files now that the Rankings can show. * Removed boilerplate nonsense from the Ranking class so that it is easier to work with. * Added leaderboard preference switch demo * Created mockup data in order to display on the stats view * Modified TrackStatistics class * Added sharing permission dialog window * UI changes similar UI to example in 'Project - Requirements - additional info (Updated)’ file. added distance and vertical fields * intial xml file added * redid setup deleted all older related files to the leaderboard and redid it i think simpler???? UI looks better and flows simpler i think? * last sharpening info * Updated components to bring ALL texts for strings.xml There were some components which were hardcoding the text in the ui file, I edited it to ensure that all our components in this screen call the text from strings.xml * Created dummy data generator and dynamically load aggregated stats from dummy data generator * Made some progress toward a Refactor * Refactored the xml files a bit * Not done yet; about to change how each the system knows which leaderboard to use. * fixed errors * LeaderboardPagerAdapter now controls three Leaderboard fragments. Added an enum to determine which leaderboard is being used. * Added a few to chairlift, so the valids one can be put into a list. * Renamed one of the xml files to make it easier to find * Renamed one of the bindings * Moved the leaderboard fragment files to their own subdirectory * made changes to aggregated stats styling, add unit to stats * temp stats page * profile icon added a profile icon as the default icon * Added a system we can hopefully build off of to refresh leaderboard data * Added Seasonal Button Page * Updated format of user profile layout * Added a few to chairlift, so the valids one can be put into a list. * Binded data to the stats view * Undid my nonsense now that I know what I'm doing better * View fixed The view for seasonal data has been fixed to work like other views. The back button from the app bar has been added. An incon has beome development. * Make refresh button look decent. Ensure that refreshing targets the right RecyclerView * Waxing and Sharpening settings * Created service functions for OverallStatistics * Wax Type option to display * Fixed profile font and gravity * Established a Singleton pattern for overall season service functions * Edited the way that we refresh the leaderboard to leverage stronger control over when it is called. The leaderboard should only grab the latest data when the fragment is being constructed, or when the user specifically asks for a refresh. * updated dummy data generator * Fixed the way test data is used in the Vertical leaderboard If you want to test the Refresh feature, try it with the Vertical leaderboard! The larger data set should only show up if the user requests a refresh. Leaving and re-entering remakes the VeritcalLeaderboardFragment from scratch, which is why the smaller data set is queued up again in that case. * Minor adjustments and additions * Adding the friends icon and friends page * Adding the friends icon and friends page * Added searchButton to friends_page.xml and added search icon * Added searchButton to friends_page.xml and added search icon * Arranged the bottom app bar to its correct position * Added searchButton reference * Added searchButton reference * Add button Link to page * Added source reference to the friends icon * Add two spinners and one graph to daily_stats.xml. * Manually integrated Marmik's code into my branch. * Implement Spinner objects and event listeners for each. * resolved merge conflict * Added source reference to the friends icon * Added source reference to the friends icon * Search bar friends page * Friends - Navigation * Made new page references for each season * General text cleanliness and other miscellaneous * Update DailyRunsProvider.java 5 private methods, getDailyRunsSampleX(), for hardcoded dummy data for 5 daily run summaries and a public method, getAllDailyRuns(), to randomly call one summay. * Change opentracks chart to external linechart. * Remove unecessary code. * Retrieved user details for leaderboard alert * Update DailyRunsProvider.java Small change to the else-if conditions of the getDailyRuns() method * Update fragment_leaderboard_list_item.xml * code cleanup * Fixed the TrackDifferentiate class * Added new string * buttons in a line separated by a space. * Added unit support * color changed. * getAvgSpeedEntries and getAvgChairliftSpeedEntries functions * rilling#64 avg slope, rilling#65 total distance * Run lift statistics framework (rilling#117) Closes rilling#115 * Added refresh icon * Added leaderboard refresh * Fixed a comment typo * Chore[COMP354-87]: Update to use the singleton instance * Chore[COMP354-87]: Integrate with UI changes * Date entry format specification for last sharp/wax * Fixed location / dob variables in sharing alert * Fixed location / dob in sharing preferences allert * Updated Chairlift, TrackPoint and SegmentSplits.java * Added `plotGraph` method to the `DailyPlottingModule`. * Fixed one code style warning. * Create Getters&Setters These are created for Storing user maintenance data * Manifest file fixed * Modified the leaderboard UI * Button for Sharing Location added * Button for Sharing Location added * Updated Ski Class with the calculateRunSpecificElevationGain method which calculates the elevation gain for a specific ski run. * Adding profile_page.xml * Changed `dailyChart` height to `match_parent`. * Profile Section Added profile section bottom to bottom app bar, added icon to the bar, functionality in next commit * Small refactor of `DailyStatsActivity` to add graph plotting Refactored `spin_metrics` and `spin_freq` to use one single listener and added a call to `plotGraph` when both spinners have a value selected. * Clear the chart when unselecting a spinner value. * Added chart styling - different colors for different metrics and the running average line - increased line width to 4 * Added share live Location toggle Removed sharing location option "no one" * Fix Build.gradle * added back button on leaderboard activity added back button functionality hard coded data to test refresh for distance and day * created profile_page.xml and edited String.xml Added profile_page.xml with a profile icon in the top left and a back button in the bottom left. Added "menu_profile" in the String page. * Fixed accidental existing chart change * Statistics preview page. * Add files via upload SkiRun: Implementation and modelling of a ski run * Update SkiRun.java * Fix up some build problems * Update OverallStatistics.java * Task[COMP354-146]: Move event handlers * Task[COMP345-146]: Remove unneeded button * Implemented Cached Statistics * Added Ski History button * ski season and dates xml * ski season and dates xml and delete by mistake .idea/codeStyles/Project.xml * Added group 8 getters and setters in UserMaintenanceData file * Added default constructor to UserMaintenanceData class * Added GlobalUserData class to store persistent user maintenance data * Changed user maintenance data from loading from dummy data generator to loading from new GlobalUserData singleton * Added unit attribute getters and setters to GlobalUserData class and changed unit logic in AggregatedStatisticsAdapter * Added the notification When sharpening and waxing interval is reached to a test data * Update AggregatedStatisticsAdapter.java * Update ski_seasons_and_dates.xml add icons, separation groups and descriptions on the data * strings xml * update strings * Skisubactivity trackstatistics (rilling#168) Closes rilling#162 * Revert "Merge branch 'spring3Issue22'" This reverts commit f5ab8e1, reversing changes made to 07383f5. * Update build.gradle * Merge Conflict Solution * Update TrackStatistics.java added an avgMovingSpeed field to the TrackStatistics class * Add Run Lift List Fragment to allow showing Run/Lift Statistics --------- Co-authored-by: Kpytoo <[email protected]> Co-authored-by: Palmarino DiMarco <[email protected]> Co-authored-by: aleksandra-lelyuk <[email protected]> Co-authored-by: Tristan Lafleur <[email protected]> Co-authored-by: Philippe Lizotte <[email protected]> Co-authored-by: shimdevkun <[email protected]> Co-authored-by: shimdevkun <[email protected]> Co-authored-by: Palmarino DiMarco <[email protected]> Co-authored-by: tinatsl <[email protected]> Co-authored-by: DanielCheishvili <[email protected]> Co-authored-by: jeremy1399 <[email protected]> Co-authored-by: Tanu Patel <[email protected]> Co-authored-by: Gabriel Armas Aranibar <[email protected]> Co-authored-by: tristanjudd <[email protected]> Co-authored-by: anthony8393 <[email protected]> Co-authored-by: Yushanai <[email protected]> Co-authored-by: Tristan <[email protected]> Co-authored-by: Joon Ahn <[email protected]> Co-authored-by: raghad-jaafar <[email protected]> Co-authored-by: Etienne Plante <[email protected]> Co-authored-by: Zachary <[email protected]> Co-authored-by: saqpasse <[email protected]> Co-authored-by: Anthony8393 <[email protected]> Co-authored-by: Zaid Minhas <[email protected]> Co-authored-by: Mariem Kheyar <[email protected]> Co-authored-by: SophiaClifton <[email protected]> Co-authored-by: Sean Furtado-Sepulveda <[email protected]> Co-authored-by: Dania~ <[email protected]> Co-authored-by: DavidASauro <[email protected]> Co-authored-by: Sean Gregory <[email protected]> Co-authored-by: TristanM2 <[email protected]> Co-authored-by: silentscar57 <[email protected]> Co-authored-by: HelloWorldfromhere <[email protected]> Co-authored-by: Ex_plore <[email protected]> Co-authored-by: Amin Kadawala <[email protected]> Co-authored-by: SANJAI RATNARAJAH <[email protected]> Co-authored-by: Claroo88 <[email protected]> Co-authored-by: Victoria Pascal <[email protected]> Co-authored-by: Marmik patel <[email protected]> Co-authored-by: hadiwehbi10 <[email protected]> Co-authored-by: Charles-Philippe La Richeliere <[email protected]> Co-authored-by: SlavicCoder <[email protected]> Co-authored-by: Hovhannes Kolian <[email protected]> Co-authored-by: moe booka <[email protected]> Co-authored-by: MAX96811 <[email protected]> Co-authored-by: MAX96811 <[email protected]> Co-authored-by: moe booka <[email protected]> Co-authored-by: MTK3131 <[email protected]> Co-authored-by: Hovhannes Kolian <[email protected]> Co-authored-by: Zack Walton <[email protected]> Co-authored-by: GL34 <[email protected]> Co-authored-by: erone26 <[email protected]> Co-authored-by: mBeir96 <[email protected]> Co-authored-by: Yushan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the pull request
New methods are added that connect the calculation of the moving average speeds from TrackPoint to ChartView which can be used to update chart points in order to create a chart of the moving average speeds based on time.
Link to the the issue
#108
License agreement
By opening this pull request, you are providing your contribution under the Apache License 2.0 (see LICENSE.md).
Note: new dependencies/libraries
Please refrain from introducing new libraries without consulting the team.